remove conflict marker

diff --git a/ChangeLog b/ChangeLog
index 9a570506823acc132994199e8f5da31e808d9615..fea09797e27f8cac4016aedea020be16983e35b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006  Søren Sandmann  <sandmann@redhat.com>
        * gtk/gtkprinter.c:
        Don't ref the backend since the backend owns the printer.
 
->>>>>>> 1.7779
 2006-04-24  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9a570506823acc132994199e8f5da31e808d9615..fea09797e27f8cac4016aedea020be16983e35b6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006  Søren Sandmann  <sandmann@redhat.com>
        * gtk/gtkprinter.c:
        Don't ref the backend since the backend owns the printer.
 
->>>>>>> 1.7779
 2006-04-24  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):